From 83e26b9c41f6d2d18f54eb855490fce519aead57 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Tue, 11 Mar 2014 22:15:22 +0800 Subject: [PATCH] libxl: simplify libxl__dirname() Signed-off-by: Lai Jiangshan Acked-by: Ian Jackson --- tools/libxl/libxl_internal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 16b82b9505..1db48b6dfb 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -162,14 +162,12 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c; - char *ptr = libxl__strdup(gc, s); + char *c = strrchr(s, '/'); - c = strrchr(ptr, '/'); if (!c) return NULL; - *c = '\0'; - return ptr; + + return libxl__strndup(gc, s, c - s); } void libxl__logv(libxl_ctx *ctx, xentoollog_level msglevel, int errnoval, -- 2.30.2